From 3d079bebed333f356ed7a673f7bfcb3e0a8a569e Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Thu, 6 Jan 2005 20:50:59 +0000 Subject: [PATCH] bitkeeper revision 1.1159.170.80 (41dda4b36HJxwMUYJh_Pm07DVKiC2g) Patch from Leendert van Doorn leendert@watson.ibm.com to fix bug that was effecting mapping of IO pages when Xen was built with certain versions of gcc. --- xen/arch/x86/memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c index a540b06fca..966f92c972 100644 --- a/xen/arch/x86/memory.c +++ b/xen/arch/x86/memory.c @@ -466,11 +466,12 @@ static void put_page_from_l1e(l1_pgentry_t l1e, struct domain *d) unsigned long l1v = l1_pgentry_val(l1e); unsigned long pfn = l1_pgentry_to_pagenr(l1e); struct pfn_info *page = &frame_table[pfn]; - struct domain *e = page->u.inuse.domain; + struct domain *e; if ( !(l1v & _PAGE_PRESENT) || !pfn_is_ram(pfn) ) return; + e = page->u.inuse.domain; if ( unlikely(e != d) ) { /* -- 2.30.2